Skip to content

fix: upgrade template #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Apr 30, 2025
Merged

fix: upgrade template #1703

merged 1 commit into from
Apr 30, 2025

Conversation

mateusoliveira43
Copy link

Why the changes were made

Prepare for upgrades tests from OADP 1.5 to 1.6

How to test the changes made

Simulate a 1.5 to 1.6 upgrade (using master branch). For example

make catalog-test-upgrade
export TEST_UPGRADE=true
make test-e2e

more info:

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 8, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 8, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2025
@mateusoliveira43 mateusoliveira43 marked this pull request as ready for review April 28, 2025 12:55
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 28, 2025
mpryc
mpryc reviewed Apr 28, 2025
View reviewed changes
Copy link
Contributor

@mpryc mpryc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2025
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 76e1b87 and 2 for PR HEAD 1abd656 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 76e1b87 and 2 for PR HEAD 1abd656 in total

@mateusoliveira43
Copy link
Author

/retest

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 29, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 30, 2025 via email

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 76e1b87 and 2 for PR HEAD 1abd656 in total

fix: upgrade template
47bb863 
Signed-off-by: Mateus Oliveira <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2025
@kaovilai
Copy link
Member

kaovilai commented Apr 30, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 30, 2025 via email

@kaovilai
Copy link
Member

kaovilai commented Apr 30, 2025 via email

kaovilai
kaovilai reviewed Apr 30, 2025
View reviewed changes
Makefile
@@ -21,7 +21,7 @@ endif
# To re-generate a bundle for any other default channel without changing the default setup, you can:
# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
DEFAULT_CHANNEL = "stable"
DEFAULT_CHANNEL = "dev"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/openshift/release/blob/51f2030735aff20dc44d55625fffa16863792591/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-master__4.19.yaml#L39
Need similar change here

@kaovilai
Copy link
Member

/hold
(stops retesters from triggering)

we need ocp/release repo to update channel

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2025
@kaovilai
Copy link
Member

/test all

@kaovilai
Copy link
Member

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2025
kaovilai
kaovilai approved these changes Apr 30, 2025
View reviewed changes
Copy link
Member

@kaovilai kaovilai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 30, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mateusoliveira43, shubham-pampattiwar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [kaovilai,mateusoliveira43,shubham-pampattiwar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 30, 2025

@mateusoliveira43: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit b3e5e0b into openshift:master Apr 30, 2025
9 checks passed
@weshayutin
Copy link
Contributor

/cherry-pick oadp-1.5

@openshift-cherrypick-robot
Copy link
Contributor

@weshayutin: #1703 failed to apply on top of branch "oadp-1.5":

Applying: fix: upgrade template
Using index info to reconstruct a base tree...
M	Makefile
M	tests/e2e/upgrade_suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/upgrade_suite_test.go
CONFLICT (content): Merge conflict in tests/e2e/upgrade_suite_test.go
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix: upgrade template

In response to this:

/cherry-pick oadp-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@mateusoliveira43
Copy link
Author

no cherry-pick, this should only live on master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mpryc mpryc mpryc left review comments

@kaovilai kaovilai kaovilai approved these changes

@shubham-pampattiwar shubham-pampattiwar shubham-pampattiwar approved these changes

@savitharaghunathan savitharaghunathan Awaiting requested review from savitharaghunathan

@sseago sseago Awaiting requested review from sseago

Assignees

@kaovilai kaovilai

@mpryc mpryc

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mateusoliveira43 @openshift-ci-robot @kaovilai @weshayutin @openshift-cherrypick-robot @mpryc @shubham-pampattiwar